Fix session selection, for real this time.