fixeded query 2