closes issue #6