Fix for 64 bits compatibility