Fix tracker behaviour