Fix Issue #75