Thanks, got bug A, I couldn't reproduce B but I think I could just rewrite that bit of code to avoid that class of problem
