works now with hql