Fix Issue #7