HOTFIX: Fixed bug in previous hotfix