issue-84 fix