nobu: thanks, diff looks good and passes tests on my 32-bit x86 system