CFY-1308 fixed cast