Fixed tracking bug???!