diff --git a/templates/auto-complete.html b/templates/auto-complete.html
index 22ce2c3d..bd34ca76 100644
--- a/templates/auto-complete.html
+++ b/templates/auto-complete.html
@@ -1,7 +1,7 @@
 <div class="autocomplete" ng-if="suggestionList.visible">
   <ul class="suggestion-list">
     <li class="suggestion-item"
-        ng-repeat="item in suggestionList.items track by track(item)"
+        ng-repeat="item in suggestionList.items track by $index"
         ng-class="getSuggestionClass(item, $index)"
         ng-click="addSuggestionByIndex($index)"
         ng-mouseenter="suggestionList.select($index)">
diff --git a/templates/tags-input.html b/templates/tags-input.html
index 81e260ff..9d7206fd 100644
--- a/templates/tags-input.html
+++ b/templates/tags-input.html
@@ -2,7 +2,7 @@
   <div class="tags" ng-class="{focused: hasFocus}">
     <ul class="tag-list">
       <li class="tag-item"
-          ng-repeat="tag in tagList.items track by track(tag)"
+          ng-repeat="tag in tagList.items track by $index"
           ng-class="getTagClass(tag, $index)"
           ng-click="eventHandlers.tag.click(tag)">
         <ti-tag-item scope="templateScope" data="::tag"></ti-tag-item>