make manual tracking work once again