How do you keep your baby swaddled?

My son always seems to find a way to get his arm out of even the tightest swaddles! He then of course, either scratches his face to pieces, jerks so much that he wakes up, or smacks his pacifier out of his mouth and wakes up. Any tips?