issue #142 fixed