Fix for U4-5145 and U4-5316