Addresses issue #228