Fixed bug with tableview re-ordering.