Fix a leak and save