fix cleanup issue