Fixed issue 45595