Commit fixbug branch