issue #9 fixed