patch #6174