Added table fix