More careful about $STATE not being bound