Fix highlighting mess