Addressing issue #5