Fixed dynamically updated the map