Improves state-override reliability, maybe