Fix for patch with country/countries