Add workaround for county glitch