Fix Issue #74