Extra small improvement to context smooth switching, to make it truly robust