Addresses #592