Issue #7 Fix