Selected class on deploy screen changing between respawns

Sometimes if I try to respawn too fast after dying I won't realise that the selected class is different to the class that I was playing as last meaning I end up spawning with the wrong class. The class is usually one to the right of the previous class so I'm guessing it happens because pressing C shortly after spawning (which I often do to crouch) still changes class on the deploy screen (Z and C to change class) even though the deploy screen is no longer visible.