Now returns proper city