country checkout bugfix