Addresses issue #369