diff --git a/app/coffee/modules/kanban/main.coffee b/app/coffee/modules/kanban/main.coffee
index 1038f5b3..32acbd99 100644
--- a/app/coffee/modules/kanban/main.coffee
+++ b/app/coffee/modules/kanban/main.coffee
@@ -305,7 +305,7 @@ KanbanColumnHeightFixerDirective = ->
 module.directive("tgKanbanColumnHeightFixer", KanbanColumnHeightFixerDirective)
 
 #############################################################################
-## Kaban User Story Directive
+## Kanban User Story Directive
 #############################################################################
 
 KanbanUserstoryDirective = ($rootscope) ->
@@ -368,7 +368,7 @@ KanbanSquishColumnDirective = (rs) ->
 module.directive("tgKanbanSquishColumn", ["$tgResources", KanbanSquishColumnDirective])
 
 #############################################################################
-## Kaban WIP Limit Directive
+## Kanban WIP Limit Directive
 #############################################################################
 
 KanbanWipLimitDirective = ->
@@ -378,7 +378,7 @@ KanbanWipLimitDirective = ->
         redrawWipLimit = ->
             $el.find(".kanban-wip-limit").remove()
             timeout 200, ->
-                element = $el.find(".kanban-task")[$scope.status.wip_limit]
+                element = $el.find(".kanban-task")[$scope.$eval($attrs.tgKanbanWipLimit)]
                 if element
                     angular.element(element).before("<div class='kanban-wip-limit'></div>")
 
diff --git a/app/partials/views/modules/kanban-table.jade b/app/partials/views/modules/kanban-table.jade
index 1e80c37b..2eef8839 100644
--- a/app/partials/views/modules/kanban-table.jade
+++ b/app/partials/views/modules/kanban-table.jade
@@ -29,7 +29,7 @@ div.kanban-table(tg-kanban-squish-column)
         div.kanban-table-inner(tg-kanban-row-width-fixer)
             div.kanban-uses-box.task-column(ng-class='{vfold:folds[s.id]}', ng-repeat="s in usStatusList track by s.id",
                                             tg-kanban-sortable,
-                                            tg-kanban-wip-limit,
+                                            tg-kanban-wip-limit="s.wip_limit",
                                             tg-kanban-column-height-fixer)
                 div.kanban-task(ng-repeat="us in usByStatus[s.id] track by us.id",
                                 tg-kanban-userstory, ng-model="us",