Addressing issue #76