Should fix PROBCORE-389