Fix #20!  Rearrange columns.