32-bit fix (II)