-issue #7 fix