Fixed issue 50270