Correcting env order