New North America map in two parts

I have just purchased the new map for North America and this appears as two entries in Basecamp. I'm assuming one has continental USA and the other has the rest. If I select one, then create a route across the Canadian border, the portion of the route in Canada, plots as a straight line. If I choose the other map option (they both appear as "City Navigator North America NT2025.1"), the USA portion of the route plots as a straight line and the Canada bit plots correctly.

Has Garmin realised this will happen with the maps split in two in this way? Incidentally, when copied onto my Garmin SmartDrive 65, it will calculate the route correctly (I have to turn GPS off, of course). To overcome the problem, I use my previous map on USB stick to calculate the cross-border route.