-fix to query