Cast expression fix