fixed issue #136