better handling for Leaflet