issue #61 fixed