Addresses #592

See #592