Fixed CleanCurrent again