fixed issue #37