diff --git a/src/parser/lexer.c b/src/parser/lexer.c
index b01f090..79540c7 100644
--- a/src/parser/lexer.c
+++ b/src/parser/lexer.c
@@ -6,7 +6,7 @@
 /*   By: sede-san <sede-san@student.42madrid.com    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2026/02/09 18:56:41 by sede-san          #+#    #+#             */
-/*   Updated: 2026/02/10 08:53:56 by sede-san         ###   ########.fr       */
+/*   Updated: 2026/02/10 09:11:23 by sede-san         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -129,9 +129,15 @@ static t_token *read_token(
 	const char *line,
 	size_t *i)
 {
-	while (ft_isspace(line[*i]) || is_meta(line[*i]))
+	const size_t	start = *i;
+	size_t 			end;
+
+	while (is_meta(line[*i]))
 		(*i)++;
-	return (token_new(type, NULL));
+	end = *i;
+	while (ft_isspace(line[*i]))
+		(*i)++;
+	return (token_new(type, ft_substr(line, start, end - start)));
 }
 
 static t_token *read_word(