#668: Fix table serialization