Fixed issue during table cell generation