Fix/support 32bit