Hotfix for simple query