Fix data creation in table