Fix Issue #7 bug