Patch #2 looks good.