Applied patch #2