fix issue-3