Fix for issue #67

Fix for issue #67