Hotfix on stupid bug