Applied patch #3