Addressing issue #67