Replaces #67

Fixes #57