diff --git a/commands/FBXCTestCommands.py b/commands/FBXCTestCommands.py
index 63ca73f..4b34352 100644
--- a/commands/FBXCTestCommands.py
+++ b/commands/FBXCTestCommands.py
@@ -74,7 +74,7 @@ def run(self, arguments, options):
       element = "XCUIApplication()" if language == lldb.eLanguageTypeSwift else "(XCUIApplication *)[[XCUIApplication alloc] init]"
 
     # Evaluate object
-    element_sbvalue = fb.evaluateExpressionValue("{}".format(element), language)
+    element_sbvalue = fb.evaluateExpressionValue("{}".format(element), language=language)
     """:type: lldb.SBValue"""
 
     # Get pointer value, so it will be working in Swift and Objective-C
@@ -84,7 +84,7 @@ def run(self, arguments, options):
     snapshot = take_snapshot(element_pointer)
 
     # Print tree for snapshot element
-    snapshot_object = XCElementSnapshot(snapshot, language)
+    snapshot_object = XCElementSnapshot(snapshot, language=language)
     print snapshot_object.tree().hierarchy_text(pointer=options.pointer, trait=options.trait, frame=options.frame)
 
 
@@ -105,7 +105,7 @@ def run(self, arguments, options):
       element = "XCUIApplication()" if language == lldb.eLanguageTypeSwift else "(XCUIApplication *)[[XCUIApplication alloc] init]"
 
     # Evaluate object
-    element_sbvalue = fb.evaluateExpressionValue("{}".format(element), language)
+    element_sbvalue = fb.evaluateExpressionValue("{}".format(element), language=language)
     """:type: lldb.SBValue"""
 
     # Get pointer value, so it will be working in Swift and Objective-C
@@ -115,7 +115,7 @@ def run(self, arguments, options):
     snapshot = take_snapshot(element_pointer)
 
     # Print details of snapshot element
-    snapshot_object = XCElementSnapshot(snapshot, language)
+    snapshot_object = XCElementSnapshot(snapshot, language=language)
     print snapshot_object.detail_summary()
 
 
@@ -144,7 +144,7 @@ def run(self, arguments, options):
       element = "XCUIApplication()" if language == lldb.eLanguageTypeSwift else "(XCUIApplication *)[[XCUIApplication alloc] init]"
 
     # Evaluate object
-    element_sbvalue = fb.evaluateExpressionValue("{}".format(element), language)
+    element_sbvalue = fb.evaluateExpressionValue("{}".format(element), language=language)
     """:type: lldb.SBValue"""
 
     # Get pointer value, so it will be working in Swift and Objective-C
@@ -154,7 +154,7 @@ def run(self, arguments, options):
     snapshot = take_snapshot(element_pointer)
 
     # Print tree for snapshot element
-    snapshot_object = XCElementSnapshot(snapshot, language)
+    snapshot_object = XCElementSnapshot(snapshot, language=language)
     elements = snapshot_object.find_missing_identifiers(status_bar=options.status_bar)
     if elements is not None:
       print elements.hierarchy_text(pointer=options.pointer, trait=options.trait, frame=options.frame)
diff --git a/fblldbbase.py b/fblldbbase.py
index d37fb4a..40d393a 100755
--- a/fblldbbase.py
+++ b/fblldbbase.py
@@ -38,7 +38,7 @@ def run(self, arguments, option):
 
 # evaluates expression in Objective-C++ context, so it will work even for
 # Swift projects
-def evaluateExpressionValue(expression, language=lldb.eLanguageTypeObjC_plus_plus, printErrors=True):
+def evaluateExpressionValue(expression, printErrors=True, language=lldb.eLanguageTypeObjC_plus_plus):
   frame = lldb.debugger.GetSelectedTarget().GetProcess().GetSelectedThread().GetSelectedFrame()
   options = lldb.SBExpressionOptions()
   options.SetLanguage(language)