fix some start and end