Hotfix after merge