Fix to new load mechanism PROBCORE-627