diff --git a/bonus/ft_printf_bonus.c b/bonus/ft_printf_bonus.c
index 07f6462..68dbbb8 100644
--- a/bonus/ft_printf_bonus.c
+++ b/bonus/ft_printf_bonus.c
@@ -10,10 +10,10 @@
 /*                                                                            */
 /* ************************************************************************** */
 
-#include <stdarg.h>
-#include <unistd.h>
 #include "ft_printf_bonus.h"
+#include <stdarg.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 static int	ft_print_arg_flags(t_arg *arg, va_list args)
 {
@@ -84,11 +84,11 @@ int	ft_printf(const char *first_arg, ...)
 	while (first_arg[i])
 	{
 		temp = nb_print;
-		if (first_arg[i] == '%')
+		if (first_arg[i] == '%' && first_arg[i + 1] != '\0')
 		{
 			i++;
-			nb_print += ft_print_arg((char *) &first_arg[i], args);
-			i += ft_to_skip((char *) &first_arg[i]);
+			nb_print += ft_print_arg((char *)&first_arg[i], args);
+			i += ft_to_skip((char *)&first_arg[i]);
 		}
 		else
 			nb_print += write(1, &first_arg[i], 1);
diff --git a/src/ft_printf.c b/src/ft_printf.c
index d5e5930..2fb4f80 100644
--- a/src/ft_printf.c
+++ b/src/ft_printf.c
@@ -10,9 +10,9 @@
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "ft_printf.h"
 #include <stdarg.h>
 #include <unistd.h>
-#include "ft_printf.h"
 
 static int	ft_print_arg(char c, va_list args)
 {
@@ -48,7 +48,7 @@ int	ft_printf(const char *first_arg, ...)
 	while (first_arg[i])
 	{
 		temp = nb_print;
-		if (first_arg[i] == '%')
+		if (first_arg[i] == '%' && first_arg[i + 1] != '\0')
 		{
 			i++;
 			nb_print += ft_print_arg(first_arg[i], args);