Ah, I should not have been such a copy cat. I've addressed this in 81cf316