Bug fix with cities