Addresses issue #2