Fixed issue 47940