fixed issue #8