fix Thao's unacceptable mistakes