Little Houdini

[dragonfly]

Hello!
My gorgeous 4 month old son has been a wonderful sleeper and almost never wakes up crying or upset. (I guess we have been spoilt)
BUT.... he needs his wrap to keep his hands away from his face in order to fall asleep and he is impossible to keep wrapped now for more than 20 seconds.
Has anyone got any suggestions for keeping him wrapped or at least stopping him from taking out his dummie or scratching his face?
(We stopped using mittens once he figured out how to take them off.)
He seems to really want to sleep but is his own worst enemy. I think exhaustion finally gets him by the end of the day.
I hate "fighting" him to stay wrapped but at the same time his little eyes are hanging out of his head with fatigue.
Any ideas would be really lovely.
Cheers