Fix regression that caused crashes while selection again