Take advantage of PR to Leaflet