OK, really fix 64bit now