Huh, I was hoping you'd squash two issues with one PR ;-)