issue #6 fix