Addressing issue #8