Fixed routing response bugs