Table2 fix