New hotfix for later users
Merge commit