Fixed bugs PROBCORE-404