Addressing Github issue #133