Fix ordering of columns