Fixed cleanup leak