Brought 32-bit impl in line with 64-bit impl