Fixed a bug introduced to the router in the last push