data selection fix