fixed issue-3