Fixes #28

Fixes #28