Alright. I think I've got the race condition fixed. Well, not properly, but according to the requirements of the spec ;P