commit by jayli,bugfix