Fix Model.save