issue #87 fixed