Fixing issue with countries/states helpers being extended improperly