FIXED ISSUE #1