Fix out of order fields