Fixed another query