Fix state assignations.