issue 13497 fix