fix on query