Fix of  issue U4-5007