Improve internal cast