update on issue #1