Fixed cleanup failure