City section, Fixes #34