MAIN-3286 quick fix