City fix (27/28)

City fix