[PATCH] env: Fix default environment saving issue