And another hotfix