fixed issue #142