I haven't reviewed RFC4122 to check that this actually matches the algorithm but it looks like it fixes the issue (and that's all we need for the live test).