PROBCORE-345 Working on fixing bug