Fixed issue 35339