Patch #2 checked, working as expected.