Fixed CleanCurrent