Addressing issue #148