Addresses issue #212