yet another damn hotfix