ISSUE #4 fixed