MT#7423 trying to deal with sems 1.6 different behaviour