Small improvement on router