Fix issue with table entity serialization
Merge pull request #643 from andrerod/dev

Fix issue with table entity serialization