Fix issue #33

Fixes #33