fixing yuxiao problems