Fix CoreData fast save/delete issue