Fix for U4-5852