Fix #600.  Add regression test