diff --git a/src/cli.c b/src/cli.c
index 4cf4cc1..977d857 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -2671,7 +2671,7 @@
 		l->default_target = global.stats_fe->default_target;
 		l->options |= (LI_O_UNLIMITED | LI_O_NOSTOP);
 		/* it's a sockpair but we don't want to keep the fd in the master */
-		l->options &= ~LI_O_INHERITED;
+		l->rx.flags &= ~RX_F_INHERITED;
 		l->nice = -64;  /* we want to boost priority for local stats */
 		global.maxsock++; /* for the listening socket */
 	}
diff --git a/src/listener.c b/src/listener.c
index 27476cd..ededb1a 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -574,7 +574,7 @@
 		proto->add(l, port);
 
 		if (inherited)
-			l->options |= LI_O_INHERITED;
+			l->rx.flags |= RX_F_INHERITED;
 
 		HA_SPIN_INIT(&l->lock);
 		_HA_ATOMIC_ADD(&jobs, 1);
diff --git a/src/mworker.c b/src/mworker.c
index 1caec10..d6365e1 100644
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -426,7 +426,7 @@
 				/* unbind the listener but does not close if
 				   the FD is inherited with fd@ from the parent
 				   process */
-				if (l->options & LI_O_INHERITED)
+				if (l->rx.flags & RX_F_INHERITED)
 					unbind_listener_no_close(l);
 				else
 					unbind_listener(l);
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 84b3635..fe0fdca 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -777,7 +777,7 @@
 	          thread_mask(listener->rx.settings->bind_thread) & all_threads_mask);
 
 	/* for now, all regularly bound TCP listeners are exportable */
-	if (!(listener->options & LI_O_INHERITED))
+	if (!(listener->rx.flags & RX_F_INHERITED))
 		fdtab[fd].exported = 1;
 
  tcp_return:
diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index 4378db3..5cabea2 100644
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -270,7 +270,7 @@
 	          thread_mask(listener->rx.settings->bind_thread) & all_threads_mask);
 
 	/* for now, all regularly bound UNIX listeners are exportable */
-	if (!(listener->options & LI_O_INHERITED))
+	if (!(listener->rx.flags & RX_F_INHERITED))
 		fdtab[fd].exported = 1;
 
 	return err;
diff --git a/src/proxy.c b/src/proxy.c
index 3f25dac..21d11ee 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1370,7 +1370,7 @@
 			continue;
 		}
 		/* The master should not close an inherited FD */
-		if (master && (l->options & LI_O_INHERITED))
+		if (master && (l->rx.flags & RX_F_INHERITED))
 			unbind_listener_no_close(l);
 		else
 			unbind_listener(l);