True, once you add the wraps it won't invert anymore.  
A prussik above the figure-8 might catch before the rope whips through it, or might not.  
The accident happened because I broke two of my own rules: #1 Knot the end of the rope and #2 Be aware of where the end of the rope is.  
_________________________
 - Tom S. 
"Never trust and engineer who doesn't carry a pocketknife."