diff --git a/src/com/vaadin/ui/CustomTable.java b/src/com/vaadin/ui/CustomTable.java
index 10da9bd..65e1b75 100644
--- a/src/com/vaadin/ui/CustomTable.java
+++ b/src/com/vaadin/ui/CustomTable.java
@@ -2273,6 +2273,7 @@ private void parseItemIdToCells(Object[][] cells, Object id, int i,
                 .generateRow(this, id) : null;
         cells[CELL_GENERATED_ROW][i] = generatedRow;
 
+		Item item=getItem(id);
         for (int j = 0; j < cols; j++) {
             if (isColumnCollapsed(colids[j])) {
                 continue;
@@ -2285,7 +2286,7 @@ private void parseItemIdToCells(Object[][] cells, Object id, int i,
 
             if (!isGenerated) {
                 try {
-                    p = getContainerProperty(id, colids[j]);
+					p = item.getItemProperty(colids[j]);
                 } catch (Exception e) {
                     exceptionsDuringCachePopulation.add(e);
                     value = null;