Fix for 64 bit support