add table on fetch

Fixes Issue #528