Swaddling dilema!

Sunny
Josiah is 4 1/2 months and has always done great with the swaddle. Lately I guess we've been in the 4 month sleep regression and he's been struggling with the swaddle. He busts his arms out and wakes himself up. It's not like he's resisting the swaddle because it's keeping him from sleeping. Any other parents deal with this and maybe have come up with a solution?