Display shows "United States" when getting a toll free call

Since I've upgraded to IOS 9 when you get an incoming call from a toll free number, what you see on the phone display is the toll free number followed by "United States" even if the 1-800 number is a canadian 1-800 number and the caller is from Canada. This used to happens only on Android mobile devices but now Apple devices show the same and it doesn't matter the carrier.

This is very annoying since when I call my customer I display my toll free number and I live in Canada.

Does Apple inted to fix this since not all Toll Free number calls originate from the US? Or maybe there is a way to correct this in the setting menu of the phone?