Fix bugs with map