Cast fix