Fix router bug not passed properly to context