Fix start and end point drawing