Fix Issue #67