ISSUE #1 fixed