Issue 47 fix

Fixes #47