Hotfix for previous change