Addressing issue #1