Walk just a few blocks in New York City and you’ll likely spot an electric bike zipping by.

The vehicles have become increasingly popular in recent years, especially among delivery drivers, tens of thousands of whom weave through New York streets. But the e-bike influx has caused a wave of fires sparked by their batteries, some of them deadly.

Now, the city wants to fight those fires with battery swapping. A pilot program will provide a small number of delivery drivers with alternative options to power up their e-bikes, including swapping stations that supply fully charged batteries on demand.