I avoid stretching now, I spend more time warming up. I tend to over stretch which makes it worse.