Fix Issue #68