diff --git a/packages/tasks-common/tasks-common.client.js b/packages/tasks-common/tasks-common.client.js
index 4f9d74c..73f6a4a 100644
--- a/packages/tasks-common/tasks-common.client.js
+++ b/packages/tasks-common/tasks-common.client.js
@@ -12,20 +12,25 @@ const App = () => {
   const firstTask = tasks[0];
   const lastTask = tasks[tasks.length - 1];
 
+  const onAction = useCallback(() => {
+    if (!reactive) fetchTasks();
+  }, [reactive]);
+
   const onAddClick = useCallback(async () => {
-    const parts = lastTask?.description?.split(' ') || [];
-    const nextTaskNum = (parseFloat(parts[parts.length - 1] || '0') || 0) + 1;
+    const descriptionsParts = lastTask?.description?.split(' ') || [];
+    const lastDescriptionNum = (parseFloat(descriptionsParts[descriptionsParts.length - 1] || '0') || 0);
+    const nextTaskNum = lastDescriptionNum + 1;
     await Meteor.callAsync('insertTask', { description: `New Task ${nextTaskNum}` });
-    if (!reactive) fetchTasks();
-  }, [reactive, lastTask?._id]);
+    onAction();
+  }, [onAction, lastTask?._id]);
   const onRemoveClick = useCallback(async () => {
     await Meteor.callAsync('removeTask', { taskId: firstTask?._id });
-    if (!reactive) fetchTasks();
-  }, [reactive, firstTask?._id]);
+    onAction();
+  }, [onAction, firstTask?._id]);
   const onRemoveAllClick = useCallback(async () => {
     await Meteor.callAsync('removeAllTasks');
-    if (!reactive) fetchTasks();
-  }, [reactive]);
+    onAction();
+  }, [onAction]);
 
   const fetchTasks = useCallback(async () => {
     if (reactive) return;