Fix highlighting recursion
Manual merge