diff --git a/app/index.html b/app/index.html
index bb93b50..10702e7 100644
--- a/app/index.html
+++ b/app/index.html
@@ -16,6 +16,10 @@
     appInstance.renderInto(document.body);
 </script>
 <div id="history" style="display: none">
+    <div class="version">0.1.1</div>
+    <ul>
+        <li>Bugfix: race condition when deleting certain entries.</li>
+    </ul>
     <div class="version">0.1.0</div>
     <ul>
         <li>Initial open source and beta release.</li>
diff --git a/app/source/TodoList.js b/app/source/TodoList.js
index 764b106..bce0b51 100644
--- a/app/source/TodoList.js
+++ b/app/source/TodoList.js
@@ -188,7 +188,15 @@ enyo.kind({
     todoTap: function(inSender, inEvent) {
         this.selectedIndex = inEvent.rowIndex;
         if (this.selectedIndex != undefined) {
-            this.selectedId = this.sortedList[this.selectedIndex].num-1;
+            //this.selectedId = this.sortedList[this.selectedIndex].num-1;
+            var num = this.sortedList[this.selectedIndex].num;
+            function getIdx(list, num) {
+                for (var i=0; i<list.length; i++) {
+                    if (list[i].num == num)
+                        return i;
+                }
+            }
+            this.selectedId = getIdx(this.owner.todoList,num);
         }
         var r = this.sortedList[inEvent.rowIndex];