Handle international numbers when using national format. Fixes #13