I am very glad you caught this... I think your current PR works just fine.  Can you rebase so I can merge this?