Fixed issue 36245