Fixed save problems