Fixing query issue with #9