Fix bug and Add comment