Fixed bug with route matching