Re-ordering file ownership fix.