I have a straight forward fix which also improves overall efficiency and robustness, but not an easy way to test it.