adapted to change in TableLayout