Fixed issue 35225