Fixed issue #235597