Fix for crazy routes issue