diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/TableNode.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/TableNode.java
index e23d3f75..900fa9ea 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/TableNode.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/layoutparsing/document/graph/nodes/TableNode.java
@@ -119,13 +119,13 @@ public class TableNode implements SemanticNode {
 
     public Stream<TableCellNode> streamCol(int col) {
 
-        return streamTableCells().filter(tableCellNode -> tableCellNode.getCol() == col);
+        return IntStream.range(0, numberOfRows).boxed().map(row -> getCell(row, col));
     }
 
 
     public Stream<TableCellNode> streamRow(int row) {
 
-        return streamTableCells().filter(tableCellNode -> tableCellNode.getRow() == row);
+        return IntStream.range(0, numberOfCols).boxed().map(col -> getCell(row, col));
     }
 
 
@@ -137,7 +137,7 @@ public class TableNode implements SemanticNode {
 
     public Stream<TableCellNode> streamHeadersForCell(int row, int col) {
 
-        return streamHeaders().filter(cell -> cell.getRow() == row || cell.getCol() == col);
+        return Stream.concat(streamRow(row), streamCol(col)).filter(TableCellNode::isHeader);
     }