update issue #7