Addresses #568