The patch #3 looks good.