fix: always sort env vars after override

fix: always sort env vars after override #631