Fixlet for 64bits support