Fix readiness and dispose mechanism in conditions