fixed city has scope issue