Followup to ae0b5d0: automatic tracking