closes issue #54