fixed query hopefully