Fixed issue 39477