- fixed issue #7