bugfix
Finish 1.0