Transitioning out of Swaddle

Mommas, my little is 16 weeks but has not started rolling. She has escaped out of her swaddle though a couple of times in January. How did you do it and when? Should I wait until 4 month sleep regression is over or do it before it comes? (If she hasn’t started rolling by than)