get geometry right!