issue #234 fixed