Fixed issue 52825