Re #8568. Fixed storing and saving curves