Table class fix