Dirty hotfix