fixed query...