FIX call ClearUndones before indexing