Map fix 2

Needs testing