Fixed issue 42036