Trying to fix highlighting