issue #9 fix