Take MACHINE_TYPE into account