Fix + new hql