Second attempt to fix highlighting, let's see if this gets phantom stalls