swaddling and rolling over

[tjandhuffy]

our 15 week old daughter slept great until a few weeks ago. we swaddle her and used a sleep positioner, but then she learned to roll on her tummy-- even with the positioner. so we stopped using that. now she rolls over on tummy, swaddled, and starts crying. we roll her on her back, she immediately goes on her tummy. over and over. now none of us is sleeping.

any thoughts on how to handle this? (just today, she learned to roll from tummy to back)