Route bug? Ajax, ON, Canada to Highmark Stadium, Buffalo.

Trying to plan a route from Ajax, ON, Canada to Highmark Stadium, need a return trip plan. Trip from Ajax to Buffalo looks good/accurate. But the return trip every time routes us through Buffalo, up all the way around Lake Ontario and through Kingston, Ontario. What should be a 2.5 hour drive routes 8+ hours! And there are plenty of charging options on the way there. Happens on web and in iOS app as well.