Second attempt to fix dragoon invalid deletes. (requires PC testing)