Making sure column order is preserved, fixes #61