Quick fix for PROBCORE-159