Fixes issue #67

This seems to fix the issue.