Patch #6387