Fixed country selection problem