Fix for dynamic determination of customer_country value.