Issue #67

Issue #67 fix