Fix cleanup issue