fixup! add lifecycle disable checks