Put with-tracking at the right place.