patch #6557