Fixed bug with improper table column data order