Another fix for 32-bit (amends commit b825605).