diff --git a/ui/src/main/java/com/getbubblenow/android/repository/DataRepository.java b/ui/src/main/java/com/getbubblenow/android/repository/DataRepository.java
index 2e4e842..db6c3ac 100644
--- a/ui/src/main/java/com/getbubblenow/android/repository/DataRepository.java
+++ b/ui/src/main/java/com/getbubblenow/android/repository/DataRepository.java
@@ -153,11 +153,13 @@ public class DataRepository {
                                         }
                                     }, throwable -> {
                                         Log.d("ERR", "getNodeBaseURI");
-                                        getNodeIndex(nodeIndex++,username,password,context,liveData);
+                                        nodeIndex++;
+                                        getNodeIndex(nodeIndex,username,password,context,liveData);
                                     });
                             compositeDisposable.add(getNodeBaseURIDisposable);
                         }, throwable -> {
-                            getNodeIndex(nodeIndex++,username,password,context,liveData);
+                            nodeIndex++;
+                            getNodeIndex(nodeIndex,username,password,context,liveData);
                             Log.d("ERR", "getSages-login");
                         });
                 compositeDisposable.add(disposableLogin);
@@ -216,6 +218,7 @@ public class DataRepository {
                         .subscribe(listDevices -> {
                             boolean hasDevice = false;
                             for (Device item : listDevices) {
+                                //TODO Add errbit for this case
                                 if (UserStore.getInstance(context).getDeviceID().equals(item.getUuid())) {
 //                                    UserStore.getInstance(context).setToken(token);
                                     setMutableLiveData(StatusResource.success(null));