Hotfix for previous commit