Ouch!  dreadful!

Could we get perhaps a unit test for this, so it doesn't happen again?