Fixed routing to existing state