Fix of U4-4382