Applied patch #1