Fix made for all table formats