Fixes

Fixes #28