Fix for routes with values. Have to move this out of view later.