Fix a query