TableContentFactory fixed...