Fixed issue #138586