Fixes PROBCORE-251