diff --git a/EditSet.tsx b/EditSet.tsx
index 00e5fa6f..9d15f9e1 100644
--- a/EditSet.tsx
+++ b/EditSet.tsx
@@ -26,7 +26,8 @@ export default function EditSet() {
       console.log(`${EditSet.name}.focus:`, set);
       let title = 'Create set';
       if (typeof set.id === 'number') title = 'Edit set';
-      else if (count > 0) title = `${set.name} (${count + 1} / ${set.sets})`;
+      else if (Number(set.sets) > 0)
+        title = `${set.name} (${count + 1} / ${set.sets})`;
       navigation.getParent()?.setOptions({
         headerLeft: () => (
           <IconButton icon="arrow-back" onPress={() => navigation.goBack()} />
diff --git a/SetList.tsx b/SetList.tsx
index f7e594e3..cc2e9e13 100644
--- a/SetList.tsx
+++ b/SetList.tsx
@@ -38,20 +38,24 @@ export default function SetList() {
     if (todaysPlan.length === 0) return;
     const todaysSet = await getToday();
     const todaysWorkouts = todaysPlan[0].workouts.split(',');
+    setWorkouts(todaysWorkouts);
     let workout = todaysWorkouts[0];
     let best = await getBestSet(workout);
+    console.log({todaysSet, todaysWorkouts, todaysPlan});
     if (todaysSet && todaysWorkouts.includes(todaysSet.name)) {
-      const _count = await countToday(todaysSet.name);
+      let _count = await countToday(todaysSet.name);
       workout = todaysSet.name;
       best = await getBestSet(workout);
       const index = todaysWorkouts.indexOf(todaysSet.name) + 1;
-      if (_count >= Number(best.sets))
+      if (_count >= Number(best.sets)) {
         best = await getBestSet(todaysWorkouts[index]);
+        _count = 0;
+      }
       if (best.name === '') setCount(0);
       else setCount(_count);
     }
+    console.log({best});
     setSet({...best});
-    setWorkouts(todaysWorkouts);
   }, []);
 
   const refresh = useCallback(async () => {