Reorginize and fixing of bug on 32-bit.
A small change to enhance the effect.