Fix issue 26

Fixes #26