Fix weird DataGrid behaviour, again