Add support for 32-bits