Fix highliting by separate calling func