updated to issue #1