#29799 - hql cast fixed