FIX Bug Issue #1