update issue #61
update issue #61