MAIN-2657 hotfix