Temp fix for tilemap
Merge issues