Fixed issue 39005