Adapted to x86 installation