Re #6366 fix 'save' functionality