Addresses issue #198.