Fix of U4-4538