diff --git a/42sh/Makefile b/42sh/Makefile
index 022edaf7..50dac7ab 100644
--- a/42sh/Makefile
+++ b/42sh/Makefile
@@ -6,14 +6,14 @@
 #    By: wescande <wescande@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2016/08/29 21:32:58 by wescande          #+#    #+#              #
-#    Updated: 2017/03/23 17:01:20 by ariard           ###   ########.fr        #
+#    Updated: 2017/03/23 18:17:44 by jhalford         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 NAME		=	42sh
 
 CC			=	gcc
-FLAGS		=	-Wall -Wextra -Werror -fvisibility=hidden -fsanitize=address
+FLAGS		=	-Wall -Wextra -Werror -fvisibility=hidden
 D_FLAGS		=	-g
 
 DELTA		=	$$(echo "$$(tput cols)-47"|bc)
diff --git a/42sh/libft/src/mem/ft_malloc.c b/42sh/libft/src/mem/ft_malloc.c
index 4560b1e8..df1e8660 100644
--- a/42sh/libft/src/mem/ft_malloc.c
+++ b/42sh/libft/src/mem/ft_malloc.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/21 15:45:00 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/21 16:34:03 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/23 18:25:12 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,7 +19,7 @@ void	*ft_malloc(size_t size)
 	ptr = malloc(size);
 	if (!ptr)
 	{
-		ft_dprintf(2, "{red}%s{eoc}", strerror(errno));
+		ft_putstrfd(strerror(errno), 2);
 		exit(errno);
 	}
 	return (ptr);
diff --git a/42sh/libft/src/sstr/ft_sstrdel.c b/42sh/libft/src/sstr/ft_sstrdel.c
index 6d92c8ea..5aa39d86 100644
--- a/42sh/libft/src/sstr/ft_sstrdel.c
+++ b/42sh/libft/src/sstr/ft_sstrdel.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/11/03 18:04:07 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/23 18:07:14 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/23 18:18:07 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/builtin/builtin_setenv.c b/42sh/src/builtin/builtin_setenv.c
index 8cd00b78..f2d8e5f2 100644
--- a/42sh/src/builtin/builtin_setenv.c
+++ b/42sh/src/builtin/builtin_setenv.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jhalford@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/11/28 14:25:17 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/22 22:08:20 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/23 18:18:33 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/builtin/builtin_unsetenv.c b/42sh/src/builtin/builtin_unsetenv.c
index 80999e09..a7d2a674 100644
--- a/42sh/src/builtin/builtin_unsetenv.c
+++ b/42sh/src/builtin/builtin_unsetenv.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jhalford@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/11/28 14:29:17 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/23 18:06:47 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/23 18:24:41 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -28,7 +28,8 @@ int		builtin_unsetenv(const char *path, char *const av[], char *const envp[])
 		j = 0;
 		while (*env && (*env)[j])
 		{
-			if (ft_strcmp((*env)[j], av[i]) == '=')
+			if (ft_strcmp((*env)[j], av[i]) == '='
+				&& ft_strlen(av[1]) == ft_strlenchr((*env)[i], '='))
 				ft_sstrdel(*env, j);
 			else
 				j++;