reorder class column refs #2297