Tabular fix with 494207b88b14f73739ecafba20fdbf1e476d3e2b commit