fix cleanup call