Fix #22, country flag bug fix