update as suggested by issue #1