fixed issue #9