diff --git a/ftp/Makefile b/ftp/Makefile
index 7624ce99..99ac4ca8 100644
--- a/ftp/Makefile
+++ b/ftp/Makefile
@@ -10,6 +10,8 @@
 #                                                                              #
 # **************************************************************************** #
 
+SHELL		:=	bash
+
 NAME		=	server client
 
 CC			=	gcc
@@ -54,17 +56,18 @@ all :
 	@make -j $(NAME)
 
 server:		$(LIBFT_LIB) $(OBJ_DIR) $(OBJS) $(SERVER_OBJ)
-	@$(CC) $(OBJS) -o $@ \
+	@$(CC) $(FLAGS) $(OBJS) -o $@ \
 		-I $(INC_DIR) \
 		-I $(LIBFT_INC) \
-		$(LIBFT_LIB) $(SERVER_OBJ) $(FLAGS)
+		$(SERVER_OBJ) $(LIBFT_LIB)
 	@printf "\r\033[38;5;117m✓ MAKE $@ \033[0m\033[K\n"
 
 client:		$(LIBFT_LIB) $(OBJ_DIR) $(OBJS) $(CLIENT_OBJ)
-	@$(CC) $(OBJS) -o $@ \
+	@$(CC) $(FLAAGS) $(OBJS) -o $@ \
 		-I $(INC_DIR) \
 		-I $(LIBFT_INC) \
-		-lreadline $(LIBFT_LIB) $(CLIENT_OBJ) $(FLAGS)
+		$(CLIENT_OBJ) $(LIBFT_LIB) \
+		-lreadline
 	@printf "\r\033[38;5;117m✓ MAKE $@ \033[0m\033[K\n"
 
 $(LIBFT_LIB):
diff --git a/ftp/includes/ft_p.h b/ftp/includes/ft_p.h
index 1e128b73..58f06fae 100644
--- a/ftp/includes/ft_p.h
+++ b/ftp/includes/ft_p.h
@@ -24,6 +24,7 @@
 # include <readline/readline.h>
 
 # include <sys/mman.h>
+# include <sys/wait.h>
 
 typedef struct s_cmd_map	t_cmd_map;
 
diff --git a/ftp/srcs/cli_do_get.c b/ftp/srcs/cli_do_get.c
index 6035f1c2..88890254 100644
--- a/ftp/srcs/cli_do_get.c
+++ b/ftp/srcs/cli_do_get.c
@@ -36,9 +36,9 @@ int		cli_do_get(int sock, char **av)
 		console_msg(3, "received num_last_blk=[%i]", num_last_blk);
 	}
 	i = -1;
-	while (++i < num_blks)
+	while (++i < num_blks - 1)
 		net_get_fd(sock, fd, MAXSIZE);
 	if (num_last_blk)
-		net_get_fd(sock, fd, MAXSIZE);
+		net_get_fd(sock, fd, num_last_blk);
 	return (0);
 }
diff --git a/ftp/srcs/serv_do_get.c b/ftp/srcs/serv_do_get.c
index 42db2137..af9ebcc8 100644
--- a/ftp/srcs/serv_do_get.c
+++ b/ftp/srcs/serv_do_get.c
@@ -45,7 +45,7 @@ int		serv_do_get(int sock)
 	num_blks = ntohs(num_blks);
 	num_last_blk = ntohs(num_last_blk);
 	i = -1;	
-	while (++i < num_blks)
+	while (++i < num_blks - 1)
 		net_send(sock, file + i * MAXSIZE, MAXSIZE);
 	if (num_last_blk)
 		net_send(sock, file + i * MAXSIZE, MAXSIZE);