Fixed auto-word highlight