Fixed issue 40979