fix hql problem