Another try on Cast fix.