Addressing issue #143