Fixed map temp
Merge