Fixed issue 47036