MT#5887 fix a17d3c9ef4f2693fb05db603f2594278b3f8ffad