fix issue-2