diff --git a/42sh/includes/job_control.h b/42sh/includes/job_control.h
index 8396bca3..7a947624 100644
--- a/42sh/includes/job_control.h
+++ b/42sh/includes/job_control.h
@@ -6,7 +6,7 @@
 /*   By: jhalford <jhalford@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/10 16:55:09 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/23 16:13:56 by gwojda           ###   ########.fr       */
+/*   Updated: 2017/03/24 15:07:50 by gwojda           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/libft/src/error/error.c b/42sh/libft/src/error/error.c
index 3bf7451d..4b743cea 100644
--- a/42sh/libft/src/error/error.c
+++ b/42sh/libft/src/error/error.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/14 16:47:00 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/24 15:10:44 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/24 15:36:34 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/job_control/builtin_jobs.c b/42sh/src/job_control/builtin_jobs.c
index 1be75003..22ef92a6 100644
--- a/42sh/src/job_control/builtin_jobs.c
+++ b/42sh/src/job_control/builtin_jobs.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/15 17:43:01 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/24 15:12:22 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/24 15:39:48 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/job_control/job_hup_all.c b/42sh/src/job_control/job_hup_all.c
index 37944153..0933048b 100644
--- a/42sh/src/job_control/job_hup_all.c
+++ b/42sh/src/job_control/job_hup_all.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/20 11:37:40 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/20 20:51:54 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/24 15:40:55 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,11 +20,16 @@ void	job_hup_all(void)
 
 	jobc = &data_singleton()->jobc;
 	jlist = jobc->first_job;
+	if (!SH_HAS_JOBC(data_singleton()->opts))
+		return ;
 	while (jlist)
 	{
 		job = jlist->content;
+		DG("gonna SIGHUP %i", job->pgid);
+		builtin_jobs(NULL, NULL, NULL);
 		if (job->pgid != 1)
 			kill(-job->pgid, SIGHUP);
+		DG("after SIGHUP %i", job->pgid);
 		jlist = jlist->next;
 	}
 }
diff --git a/42sh/test/fifi b/42sh/test/fifi
deleted file mode 100644
index 43084821..00000000
--- a/42sh/test/fifi
+++ /dev/null
@@ -1 +0,0 @@
-       5