I was going to say the same as Lulu.

Either try no wrap, or if that distracts him too much being able to roll about (I agree it tends to be impulsive for them.. same when they learn to crawl or sit) make it a real firm wrap, and tuck a sheet over him nice and firm too to hold him there. This helped with DD.

And I should know - I'm a serial wrapper LOL I wrapped DS until 7 months, and DD was wrapped until 15 mths! At these ages they weren't wrapped all night tho, they were just wrapped for that initial night sleep, then after night feeds were left unwrapped.