fix regression causing cleanup to fail