Fixes #67

Fixes #67