Have you considered changing the packaging to keep the tail straight?