This wasn't my fault!  Fixes #40.

Also fixes another bug