Fixbug branch 1.0