Hy svwilbur, I believe you have a firm understanding of the problem, and how to fix it.