patch #6754, part II