hotfix 2 with master change