Try to fix highlighting