Put fix on both queries