diff --git a/TopSpace/CurrentBot.js b/TopSpace/CurrentBot.js
index 73c05ad8d..95b71a805 100644
--- a/TopSpace/CurrentBot.js
+++ b/TopSpace/CurrentBot.js
@@ -63,7 +63,7 @@ function newCurrentBot() {
 
     function onClick() {
 
-        if (sharedStatus.currentUserBotIndex + 1 === window.USER_PROFILE.devTeams.length) {
+        if (sharedStatus.currentUserBotIndex + 1 === window.CURRENT_BOT = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots.length) {
 
             sharedStatus.currentUserBotIndex = 0;
             window.CURRENT_BOT = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].displayName;
@@ -71,7 +71,7 @@ function newCurrentBot() {
             return;
         }
 
-        if (sharedStatus.currentUserBotIndex + 1 < window.USER_PROFILE.devTeams.length) {
+        if (sharedStatus.currentUserBotIndex + 1 < window.CURRENT_BOT = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots.length) {
 
             sharedStatus.currentUserBotIndex++;
             window.CURRENT_BOT = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].displayName;
diff --git a/TopSpace/CurrentProcess.js b/TopSpace/CurrentProcess.js
index 46dac05fc..435710522 100644
--- a/TopSpace/CurrentProcess.js
+++ b/TopSpace/CurrentProcess.js
@@ -71,14 +71,14 @@ function newCurrentProcess() {
 
     function onClick() {
 
-        if (sharedStatus.currentProcessIndex + 1 === window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots.length) {
+        if (sharedStatus.currentProcessIndex + 1 === window.CURRENT_PROCESS = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].processes.length) {
 
             sharedStatus.currentProcessIndex = 0;
             window.CURRENT_PROCESS = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].processes[sharedStatus.currentProcessIndex].name;
             return;
         }
 
-        if (sharedStatus.currentProcessIndex + 1 < window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots.length) {
+        if (sharedStatus.currentProcessIndex + 1 < window.CURRENT_PROCESS = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].processes.length) {
 
             sharedStatus.currentProcessIndex++;
             window.CURRENT_PROCESS = window.USER_PROFILE.devTeams[sharedStatus.currentDevTeamIndex].userBots[sharedStatus.currentUserBotIndex].processes[sharedStatus.currentProcessIndex].name;