Fix yao's shit