fixed broken state of map
fixed branch