Hotfix for buggy build