Addressing issue #2