fix map
Merge remote-tracking branch 'origin/map_fix'
coment birthday