However I am uncertain if this is too aggressive?  I don't have the time
to test it properly right now, but could try this (or some variation
thereof) and tell me if it addresses the issue?