#6 fixes the problem. Patch looks good. Tests all green. Good to go.