diff --git a/cluster/src/main/java/io/scalecube/cluster/fdetector/FailureDetectorImpl.java b/cluster/src/main/java/io/scalecube/cluster/fdetector/FailureDetectorImpl.java
index a63d255f..b2cb123b 100644
--- a/cluster/src/main/java/io/scalecube/cluster/fdetector/FailureDetectorImpl.java
+++ b/cluster/src/main/java/io/scalecube/cluster/fdetector/FailureDetectorImpl.java
@@ -42,11 +42,11 @@ public final class FailureDetectorImpl implements FailureDetector {
   private final Member localMember;
   private final Transport transport;
   private final FailureDetectorConfig config;
+  private final TransportWrapper transportWrapper;
 
   // State
 
   private final List<Member> pingMembers = new ArrayList<>();
-  private final TransportWrapper transportWrapper;
   private long currentPeriod = 0;
   private int pingMemberIndex = 0; // index for sequential ping member selection
 
diff --git a/cluster/src/main/java/io/scalecube/cluster/membership/MembershipProtocolImpl.java b/cluster/src/main/java/io/scalecube/cluster/membership/MembershipProtocolImpl.java
index ee394b4d..e86f5bd1 100644
--- a/cluster/src/main/java/io/scalecube/cluster/membership/MembershipProtocolImpl.java
+++ b/cluster/src/main/java/io/scalecube/cluster/membership/MembershipProtocolImpl.java
@@ -53,7 +53,6 @@
 public final class MembershipProtocolImpl implements MembershipProtocol {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(MembershipProtocol.class);
-  private final TransportWrapper transportWrapper;
 
   private enum MembershipUpdateReason {
     FAILURE_DETECTOR_EVENT,
@@ -80,6 +79,7 @@ private enum MembershipUpdateReason {
   private final FailureDetector failureDetector;
   private final GossipProtocol gossipProtocol;
   private final MetadataStore metadataStore;
+  private final TransportWrapper transportWrapper;
 
   // State