Fix crash in some countries
Bump version to 2.1.1