Fix save()