Fix table loading