fix issue-4