Fixed a bug with Anton.  Checked in a test for it too.