Unbreak header sort