Fixed map toggle
Merge