closes issue #20