duplicate extras save workardound
Merge pull request #45 from wardi/canada-v2.1

duplicate extras workaround 2 of 2