issue #5 fix