I fixed the bug, the perf test run on my PC (64 bits). Tim could you
try to reproduce it with a unit test? We need to have better coverage,
this one should have been catched.
Matt have a look to my comments on the review, if there is still a
problem on 32 bits I think applying the requested changes should fix
the problem.