- fixed issue #9