Map bug probably fixed 2
Fix commit