Env Var added hotfix