Fixes #61

To fix issue #61