issue-30 fix