This fixes #8238.  It will now do it multiple times.