New hotfix for later users