Compile hotfix for master