Addressing issue #54