BUG FIX ISSUE #10