addressing issue #1