Used fix for bad cleanup