fixed bug's
fixed bug's