Some hotfix