Yet another hotfix