addressing issue #2