fix regressions caused by deleteMe flag