diff --git a/source/bforce/bforce.c b/source/bforce/bforce.c
index 0f6512e..34df4fa 100644
--- a/source/bforce/bforce.c
+++ b/source/bforce/bforce.c
@@ -271,8 +271,8 @@ int main(int argc, char *argv[], char *envp[])
 	while (envp[i]) {
 		mainenv[i] = malloc(strlen(envp[i])+2);
 		strcpy(mainenv[i], envp[i]);
-		mainenv[i++] = NULL;
-		fprintf(stderr,"BF-DEBUG: ENV: %s\n", mainenv[(i-1)]);
+		mainenv[++i] = NULL;
+		//fprintf(stderr,"BF-DEBUG: ENV: %s\n", mainenv[(i-1)]);
 	}
 
 	// parsing
@@ -511,9 +511,8 @@ exit:
 	i=0;
 	while(mainenv[i]) {
 		DEB((D_FREE, "De-init session ENV: %s\n", mainenv[(i)]));
-		free(mainenv[i]);
+		free(mainenv[i++]);
 	}
-	free(mainenv);
 	
 	
 	deinit_conf();