diff --git a/lib_jtag_core/src/script/env.c b/lib_jtag_core/src/script/env.c
index 5e51187..7996e86 100644
--- a/lib_jtag_core/src/script/env.c
+++ b/lib_jtag_core/src/script/env.c
@@ -450,7 +450,7 @@ char * getEnvVarDatIndex( envvar_entry * env, int index, char * vardata, int max
 					stringcopy(vardata,(char*)&env->buf[off + 2 + varname_size + 2], maxsize);
 				}
 
-				return (char*)&env->buf[off + 2 + varname_size + 2];
+				return (char*)&env->buf[off + 2];
 			}
 		}
 
@@ -515,6 +515,8 @@ envvar_entry * initEnv(envvar_entry * env, envvar_entry * dst)
 				return NULL;
 			}
 
+			tmp_envvars->bufsize = env->bufsize;
+
 			memcpy(tmp_envvars->buf,env->buf,env->bufsize);
 
 			return tmp_envvars;