Fix for #68

Fixes #68