Fixed tracking bug