diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java
index ebb319b..c16e45b 100644
--- a/src/com/android/launcher3/FocusHelper.java
+++ b/src/com/android/launcher3/FocusHelper.java
@@ -326,7 +326,7 @@
                 parent = getCellLayoutChildrenForIndex(workspace, pageIndex - 1);
                 if (parent != null) {
                     iconLayout = (CellLayout) parent.getParent();
-                    matrix = FocusLogic.createSparseMatrix(iconLayout, orientation,
+                    matrix = FocusLogic.createSparseMatrix(iconLayout,
                         iconLayout.getCountX(), row);
                     newIconIndex = FocusLogic.handleKeyEvent(keyCode, countX + 1, countY, matrix,
                         FocusLogic.PIVOT, pageIndex - 1, pageCount);
@@ -353,7 +353,7 @@
                 parent = getCellLayoutChildrenForIndex(workspace, pageIndex + 1);
                 if (parent != null) {
                     iconLayout = (CellLayout) parent.getParent();
-                    matrix = FocusLogic.createSparseMatrix(iconLayout, orientation, -1, row);
+                    matrix = FocusLogic.createSparseMatrix(iconLayout, -1, row);
                     newIconIndex = FocusLogic.handleKeyEvent(keyCode, countX + 1, countY, matrix,
                         FocusLogic.PIVOT, pageIndex, pageCount);
                     newIcon = parent.getChildAt(newIconIndex);
