Fix bug where custom highlights were lost.