Fix problem with auto tracking