Build hotfix