Patch #2 LGTM. We can merge it.