Fix 32bit build
Merge pull request #2531 from jbeda/32bit-fix

Fix 32bit build