Issue 83 fix

Fixes #83