Fixed map
Fixes