YES! I have this problem too. That freaking pin is too short and pops out so two things to try...

My first attemp at fixing this was to move the connectors in two holes on the servo ams. This reduces the throw and thus fixed the problem, however, I lost neg. pitch. so I put them back to full throw.

What I'm going to try next is extending the plastic pin with a T-pin cut and CA'd in place, through the slot.

Both suggestion I got from this forum somewhere, thanks whoever you are!