Fixed variable tracker bug