closes issue #8