Fix first query