issue #137 fixed