Issue #2 Fix