issue #363 fixed