Fix to routes