Fix for 64bits distribs