diff --git a/bonus/pipex_heredoc_bonus.c b/bonus/pipex_heredoc_bonus.c
index af9b10b..708d5bf 100644
--- a/bonus/pipex_heredoc_bonus.c
+++ b/bonus/pipex_heredoc_bonus.c
@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 11:22:13 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/03/26 21:53:29 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/28 18:07:02 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -34,9 +34,9 @@ int	parsing_here_doc(int argc, char *argv[], t_data *data)
 	{
 		data->cmds[i] = get_command(argv[3 + i]);
 		data->flgs[i] = ft_split(argv[3 + i], ' ');
-		if (!data->cmds[i] || !data->flgs[i])
-			return (free_all(data));
 	}
+	if (!data->cmds[argc - 4] || !data->flgs[argc - 4])
+		return (free_all(data));
 	return (0);
 }
 
diff --git a/bonus/pipex_parsing_bonus.c b/bonus/pipex_parsing_bonus.c
index a086216..870480b 100644
--- a/bonus/pipex_parsing_bonus.c
+++ b/bonus/pipex_parsing_bonus.c
@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/01/19 17:03:01 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/03/23 17:14:59 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/03/28 21:13:13 by erey-bet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -34,16 +34,17 @@ int	parsing(int argc, char *argv[], char **env, t_data *data)
 	{
 		data->cmds[i] = get_command(argv[2 + i]);
 		data->flgs[i] = ft_split(argv[2 + i], ' ');
-		if (!data->cmds[i] || !data->flgs[i])
-			return (free_all(data));
 	}
+	if (!data->cmds[argc - 4] || !data->flgs[argc - 4])
+		return (free_all(data));
 	data->env = env;
 	return (0);
 }
 
 char	*test_acces(char **s, char **cmd, char **path, int *y)
 {
-	*s = ft_strjoin_free(*s, "/", 1);
+	if ((*cmd)[0] != '.' && (*cmd)[1] != '/')
+		*s = ft_strjoin_free(*s, "/", 1);
 	if (*s == NULL)
 		return (NULL);
 	*path = ft_strjoin_free(*s, *cmd, 1);