Fixed handling following on highlights.