Bring hotfix back to develop

Had to hotfix this on master. Now that it works, develop needs it too!