Fix issue with table entity serialization