#453 Hotfix to query issue.