more fix code
fix country too