Fix for MT#05210