Fix #439 auto_highlight problem