diff --git a/app/src/cc/arduino/autocomplete/ArduinoCompletionsList.java b/app/src/cc/arduino/autocomplete/ArduinoCompletionsList.java
index a29b7a1c8..023dca082 100644
--- a/app/src/cc/arduino/autocomplete/ArduinoCompletionsList.java
+++ b/app/src/cc/arduino/autocomplete/ArduinoCompletionsList.java
@@ -10,6 +10,7 @@ class ArduinoCompletion {
   ArduinoCompletionDetail completion;
   String type;
   String location;
+  List<ArduinoParameter> parameters;
 
   public ArduinoCompletionDetail getCompletion() {
     return completion;
@@ -22,6 +23,23 @@ class ArduinoCompletion {
   public String getLocation() {
     return location;
   }
+
+  public List<ArduinoParameter> getParameters() {
+    return parameters;
+  }
+}
+
+class ArduinoParameter {
+  String name;
+  String type;
+
+  public String getName() {
+    return name;
+  }
+
+  public String getType() {
+    return type;
+  }
 }
 
 class ArduinoCompletionDetail {
diff --git a/app/src/cc/arduino/autocomplete/ClangCompletionProvider.java b/app/src/cc/arduino/autocomplete/ClangCompletionProvider.java
index 40c0f13f8..29276142f 100644
--- a/app/src/cc/arduino/autocomplete/ClangCompletionProvider.java
+++ b/app/src/cc/arduino/autocomplete/ClangCompletionProvider.java
@@ -70,9 +70,12 @@ public class ClangCompletionProvider extends DefaultCompletionProvider {
 
         if (cc.type.equals("Function")) {
           List<Parameter> params = new ArrayList<>();
+          int i=0;
           for (CompletionChunk chunk : cc.completion.chunks) {
             if (chunk.placeholder != null) {
-              params.add(new Parameter("type", chunk.placeholder));
+              ArduinoParameter p = cc.parameters.get(i);
+              params.add(new Parameter(p.type, p.name));
+              i++;
             }
           }