Fixed stop-to-shape matching not to try to smooth stuff