Further hotfix for commit before