issue #37 fixed