Bug fixed

Bugs fixed YOHO