Bug Fixes:

* FIx a crash with the bugfix for #32 not working.
