Fix for 32-bit on 32-bit use-case.