Fix #350 - Stale index meant wrong info sent to SP