better 64bit/32bit support