fixed issue #6