More robust state override