more 32bit fix