Fix a bug with map controls