Map: fix bug