diff --git a/include/minishell.h b/include/minishell.h
index b4e2096..b61037b 100644
--- a/include/minishell.h
+++ b/include/minishell.h
@@ -44,5 +44,6 @@ t_list	**get_list(t_list **list);
 t_list	**get_list2(t_list **list);
 int		get_exit_code(int in);
 size_t	ft_arrlen(char **a);
+char	**get_rl(char **rl);
 
 #endif
diff --git a/src/builtins/ft_cd.c b/src/builtins/ft_cd.c
index b9a9d06..db8be7f 100644
--- a/src/builtins/ft_cd.c
+++ b/src/builtins/ft_cd.c
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/22 15:07:24 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/12 15:26:48 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/15 16:38:59 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -31,6 +31,7 @@ void	ft_cd(t_env *env, char *args)
 	else
 		new_pwd = ft_strdup(args);
 	ret = chdir(new_pwd);
+	free(new_pwd);
 	if (ret == -1)
 	{
 		send_error_parsing(ERROR_NO_FILE);
diff --git a/src/exec/heredoc_utils.c b/src/exec/heredoc_utils.c
index e3ee9c5..23992f2 100644
--- a/src/exec/heredoc_utils.c
+++ b/src/exec/heredoc_utils.c
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/10 01:14:10 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/13 14:03:00 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/15 17:03:12 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -70,5 +70,6 @@ void	__heredoc_sig(int code)
 	ft_lstclear(get_list(NULL), &free_token);
 	close(get_fd_heredoc(-1));
 	rl_clear_history();
+	free(*get_rl(NULL));
 	exit(130);
 }
diff --git a/src/main.c b/src/main.c
index 92516f1..b7dc5b5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,13 +6,22 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/24 11:18:04 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/15 14:02:18 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/15 17:03:47 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 #include "parsing.h"
 
+char	**get_rl(char **rl)
+{
+	static char	**ret;
+
+	if (rl)
+		ret = rl;
+	return (ret);
+}
+
 void	sig_c(int code)
 {
 	(void)code;
@@ -71,6 +80,7 @@ int	main(int ac, char **av, char **env)
 		}
 		add_history(rl);
 		rl = env_var_replace(rl, env_l);
+		get_rl(&rl);
 		piped = tokenizer(rl);
 		get_list(&piped);
 		if (check_argv(piped))