Fix cleanup bug;