Addressing issue #9