Re #6485 the last save algorithm!