Bug fixed: 32/64 bit support