HOTFIX: Change else query