Update fix to map
Merge remote-tracking branch 'origin/master' into wan-wen