Make active highlighting work properly again