fixed 32/64 in rebuild