update issue #646