Be more rigid determining terminating puncts