diff --git a/templates/wish/table.html b/templates/wish/table.html
index 73a5eb8..3b03782 100644
--- a/templates/wish/table.html
+++ b/templates/wish/table.html
@@ -19,23 +19,24 @@
     </thead>
     <tbody>
       {% for item in table_collection %}
-      {% set retirement_date = retired.get(item.fields.set) %}
-      <tr>
-        {{ table.image(item.url_for_image(), caption=item.fields.name, alt=item.fields.set) }}
-        <td>{{ item.fields.set }} {{ table.rebrickable(item) }}</td>
-        <td>{{ item.fields.name }}</td>
-        <td>{{ item.theme.name }}</td>
-        <td>{{ item.fields.year }}</td>
-        <td>{{ item.fields.number_of_parts }}</td>
-        <td>{% if retirement_date %}{{ retirement_date }}{% else %}<span class="badge rounded-pill text-bg-light border">Not found</span>{% endif %}</td>
-        {% if g.login.is_authenticated() %}
-        <td>
-          <form action="{{ item.url_for_delete() }}" method="post">
-            <button type="submit" class="btn btn-sm btn-danger"><i class="ri-delete-bin-2-line"></i> Delete</button>
-          </form>
-        </td>
-        {% endif %}
-      </tr>
+        {% with retirement_date = retired.get(item.fields.set) %}
+          <tr>
+            {{ table.image(item.url_for_image(), caption=item.fields.name, alt=item.fields.set) }}
+            <td>{{ item.fields.set }} {{ table.rebrickable(item) }}</td>
+            <td>{{ item.fields.name }}</td>
+            <td>{{ item.theme.name }}</td>
+            <td>{{ item.fields.year }}</td>
+            <td>{{ item.fields.number_of_parts }}</td>
+            <td>{% if retirement_date %}{{ retirement_date }}{% else %}<span class="badge rounded-pill text-bg-light border">Not found</span>{% endif %}</td>
+            {% if g.login.is_authenticated() %}
+            <td>
+              <form action="{{ item.url_for_delete() }}" method="post">
+                <button type="submit" class="btn btn-sm btn-danger"><i class="ri-delete-bin-2-line"></i> Delete</button>
+              </form>
+            </td>
+            {% endif %}
+          </tr>
+        {% endwith %}
       {% endfor %}
     </tbody>
   </table>