City fix (28/28)

City fix