Fixed issue 47211