diff --git a/src/main/java/org/redisson/RedissonAtomicLong.java b/src/main/java/org/redisson/RedissonAtomicLong.java
index 4892a8695..785596c9b 100644
--- a/src/main/java/org/redisson/RedissonAtomicLong.java
+++ b/src/main/java/org/redisson/RedissonAtomicLong.java
@@ -33,7 +33,7 @@ import com.lambdaworks.redis.RedisConnection;
  */
 public class RedissonAtomicLong extends RedissonExpirable implements RAtomicLong {
 
-    RedissonAtomicLong(ConnectionManager connectionManager, String name) {
+    protected RedissonAtomicLong(ConnectionManager connectionManager, String name) {
         super(connectionManager, name);
 
         init();
diff --git a/src/main/java/org/redisson/RedissonBucket.java b/src/main/java/org/redisson/RedissonBucket.java
index 00b1866b9..6ae92f689 100644
--- a/src/main/java/org/redisson/RedissonBucket.java
+++ b/src/main/java/org/redisson/RedissonBucket.java
@@ -28,7 +28,7 @@ import com.lambdaworks.redis.RedisAsyncConnection;
 
 public class RedissonBucket<V> extends RedissonExpirable implements RBucket<V> {
 
-    RedissonBucket(ConnectionManager connectionManager, String name) {
+    protected RedissonBucket(ConnectionManager connectionManager, String name) {
         super(connectionManager, name);
     }
 
diff --git a/src/main/java/org/redisson/RedissonCountDownLatch.java b/src/main/java/org/redisson/RedissonCountDownLatch.java
index 7dc3c33b0..33ef69869 100644
--- a/src/main/java/org/redisson/RedissonCountDownLatch.java
+++ b/src/main/java/org/redisson/RedissonCountDownLatch.java
@@ -52,7 +52,7 @@ public class RedissonCountDownLatch extends RedissonObject implements RCountDown
 
     private final UUID id;
 
-    RedissonCountDownLatch(ConnectionManager connectionManager, String name, UUID id) {
+    protected RedissonCountDownLatch(ConnectionManager connectionManager, String name, UUID id) {
         super(connectionManager, name);
         this.id = id;
     }
diff --git a/src/main/java/org/redisson/RedissonDeque.java b/src/main/java/org/redisson/RedissonDeque.java
index 805f4cf9e..18b8e49b2 100644
--- a/src/main/java/org/redisson/RedissonDeque.java
+++ b/src/main/java/org/redisson/RedissonDeque.java
@@ -37,7 +37,7 @@ import com.lambdaworks.redis.RedisAsyncConnection;
  */
 public class RedissonDeque<V> extends RedissonQueue<V> implements RDeque<V> {
 
-    RedissonDeque(ConnectionManager connectionManager, String name) {
+    protected RedissonDeque(ConnectionManager connectionManager, String name) {
         super(connectionManager, name);
     }
 
diff --git a/src/main/java/org/redisson/RedissonHyperLogLog.java b/src/main/java/org/redisson/RedissonHyperLogLog.java
index a1ea2481e..c9e75c6ef 100644
--- a/src/main/java/org/redisson/RedissonHyperLogLog.java
+++ b/src/main/java/org/redisson/RedissonHyperLogLog.java
@@ -27,7 +27,7 @@ import com.lambdaworks.redis.RedisAsyncConnection;
 
 public class RedissonHyperLogLog<V> extends RedissonObject implements RHyperLogLog<V> {
 
-    RedissonHyperLogLog(ConnectionManager connectionManager, String name) {
+    protected RedissonHyperLogLog(ConnectionManager connectionManager, String name) {
         super(connectionManager, name);
     }
 
diff --git a/src/main/java/org/redisson/RedissonList.java b/src/main/java/org/redisson/RedissonList.java
index ae757124a..6ae428508 100644
--- a/src/main/java/org/redisson/RedissonList.java
+++ b/src/main/java/org/redisson/RedissonList.java
@@ -44,7 +44,7 @@ public class RedissonList<V> extends RedissonExpirable implements RList<V> {
 
     private int batchSize = 50;
 
-    RedissonList(ConnectionManager connectionManager, String name) {
+    protected RedissonList(ConnectionManager connectionManager, String name) {
         super(connectionManager, name);
     }
 
@@ -183,7 +183,7 @@ public class RedissonList<V> extends RedissonExpirable implements RList<V> {
                 }
                 return result;
             }
-            
+
         });
     }
 
@@ -245,14 +245,14 @@ public class RedissonList<V> extends RedissonExpirable implements RList<V> {
     @Override
     public V set(final int index, final V element) {
         checkIndex(index);
-        
+
         return connectionManager.write(new SyncOperation<V, V>() {
             @Override
             public V execute(RedisConnection<Object, V> conn) {
                 while (true) {
                     conn.watch(getName());
                     V prev = (V) conn.lindex(getName(), index);
-                    
+
                     conn.multi();
                     conn.lset(getName(), index, element);
                     if (conn.exec().size() == 1) {
@@ -293,7 +293,7 @@ public class RedissonList<V> extends RedissonExpirable implements RList<V> {
                     conn.watch(getName());
                     V prev = (V) conn.lindex(getName(), index);
                     List<Object> tail = conn.lrange(getName(), index + 1, size());
-                    
+
                     conn.multi();
                     conn.ltrim(getName(), 0, index - 1);
                     conn.rpush(getName(), tail.toArray());
diff --git a/src/main/java/org/redisson/RedissonLock.java b/src/main/java/org/redisson/RedissonLock.java
index 210b4181e..84fafaac8 100644
--- a/src/main/java/org/redisson/RedissonLock.java
+++ b/src/main/java/org/redisson/RedissonLock.java
@@ -113,7 +113,7 @@ public class RedissonLock extends RedissonObject implements RLock {
 
     private static final ConcurrentMap<String, RedissonLockEntry> ENTRIES = new ConcurrentHashMap<String, RedissonLockEntry>();
 
-    RedissonLock(ConnectionManager connectionManager, String name, UUID id) {
+    protected RedissonLock(ConnectionManager connectionManager, String name, UUID id) {
         super(connectionManager, name);
         this.id = id;
     }
@@ -131,6 +131,7 @@ public class RedissonLock extends RedissonObject implements RLock {
                 if (newEntry.isFree()
                         && ENTRIES.remove(getEntryName(), newEntry)) {
                     synchronized (ENTRIES) {
+                        // maybe added during subscription
                         if (!ENTRIES.containsKey(getEntryName())) {
                             connectionManager.unsubscribe(getChannelName());
                         }
diff --git a/src/main/java/org/redisson/RedissonMap.java b/src/main/java/org/redisson/RedissonMap.java
index 85dfe63b1..be7bcfd8e 100644
--- a/src/main/java/org/redisson/RedissonMap.java
+++ b/src/main/java/org/redisson/RedissonMap.java
@@ -51,7 +51,7 @@ import com.lambdaworks.redis.output.MapScanResult;
 //TODO implement watching by keys instead of map name
 public class RedissonMap<K, V> extends RedissonExpirable implements RMap<K, V> {
 
-    RedissonMap(ConnectionManager connectionManager, String name) {
+    protected RedissonMap(ConnectionManager connectionManager, String name) {
         super(connectionManager, name);
     }
 
diff --git a/src/main/java/org/redisson/RedissonQueue.java b/src/main/java/org/redisson/RedissonQueue.java
index 55037b6ba..ac721aa14 100644
--- a/src/main/java/org/redisson/RedissonQueue.java
+++ b/src/main/java/org/redisson/RedissonQueue.java
@@ -34,7 +34,7 @@ import com.lambdaworks.redis.RedisAsyncConnection;
  */
 public class RedissonQueue<V> extends RedissonList<V> implements RQueue<V> {
 
-    RedissonQueue(ConnectionManager connectionManager, String name) {
+    protected RedissonQueue(ConnectionManager connectionManager, String name) {
         super(connectionManager, name);
     }
 
diff --git a/src/main/java/org/redisson/RedissonSet.java b/src/main/java/org/redisson/RedissonSet.java
index 8846aae50..63af46463 100644
--- a/src/main/java/org/redisson/RedissonSet.java
+++ b/src/main/java/org/redisson/RedissonSet.java
@@ -41,7 +41,7 @@ import com.lambdaworks.redis.output.ListScanResult;
  */
 public class RedissonSet<V> extends RedissonExpirable implements RSet<V> {
 
-    RedissonSet(ConnectionManager connectionManager, String name) {
+    protected RedissonSet(ConnectionManager connectionManager, String name) {
         super(connectionManager, name);
     }
 
@@ -78,14 +78,14 @@ public class RedissonSet<V> extends RedissonExpirable implements RSet<V> {
             }
         });
     }
-    
+
     @Override
     public Iterator<V> iterator() {
         return new Iterator<V>() {
 
             private Iterator<V> iter;
             private Long iterPos;
-            
+
             private boolean removeExecuted;
             private V value;
 
@@ -156,7 +156,7 @@ public class RedissonSet<V> extends RedissonExpirable implements RSet<V> {
     public boolean add(final V e) {
         return connectionManager.get(addAsync(e));
     }
-    
+
     @Override
     public Future<Boolean> addAsync(final V e) {
         return connectionManager.writeAsync(new AsyncOperation<V, Boolean>() {
diff --git a/src/main/java/org/redisson/RedissonSortedSet.java b/src/main/java/org/redisson/RedissonSortedSet.java
index e5c357e6f..4aa21cd97 100644
--- a/src/main/java/org/redisson/RedissonSortedSet.java
+++ b/src/main/java/org/redisson/RedissonSortedSet.java
@@ -92,7 +92,7 @@ public class RedissonSortedSet<V> extends RedissonObject implements RSortedSet<V
 
     private Comparator<? super V> comparator = NaturalComparator.NATURAL_ORDER;
 
-    RedissonSortedSet(ConnectionManager connectionManager, String name) {
+    protected RedissonSortedSet(ConnectionManager connectionManager, String name) {
         super(connectionManager, name);
 
         loadComparator();
diff --git a/src/main/java/org/redisson/RedissonTopic.java b/src/main/java/org/redisson/RedissonTopic.java
index 52bd0bf8d..328d206b8 100644
--- a/src/main/java/org/redisson/RedissonTopic.java
+++ b/src/main/java/org/redisson/RedissonTopic.java
@@ -34,7 +34,7 @@ import com.lambdaworks.redis.RedisAsyncConnection;
  */
 public class RedissonTopic<M> extends RedissonObject implements RTopic<M> {
 
-    RedissonTopic(ConnectionManager connectionManager, String name) {
+    protected RedissonTopic(ConnectionManager connectionManager, String name) {
         super(connectionManager, name);
     }