Last routes fix