Cleaner existing record fix