fix the logic fir andes project