country detection fatal fixed, plugin v2