diff --git a/pkg/compiler/codegen.go b/pkg/compiler/codegen.go
index 7f1b33eeb..743cc1773 100644
--- a/pkg/compiler/codegen.go
+++ b/pkg/compiler/codegen.go
@@ -249,9 +249,10 @@ func (c *codegen) convertFuncDecl(file ast.Node, decl *ast.FuncDecl) {
 
 	// Load the arguments in scope.
 	for _, arg := range decl.Type.Params.List {
-		name := arg.Names[0].Name // for now.
-		l := c.scope.newLocal(name)
-		c.emitStoreLocal(l)
+		for _, id := range arg.Names {
+			l := c.scope.newLocal(id.Name)
+			c.emitStoreLocal(l)
+		}
 	}
 	// Load in all the global variables in to the scope of the function.
 	// This is not necessary for syscalls.
diff --git a/pkg/compiler/function_call_test.go b/pkg/compiler/function_call_test.go
index 7c1f22367..9f1159e14 100644
--- a/pkg/compiler/function_call_test.go
+++ b/pkg/compiler/function_call_test.go
@@ -125,3 +125,14 @@ func TestFunctionWithVoidReturn(t *testing.T) {
 	`
 	eval(t, src, big.NewInt(6))
 }
+
+func TestFunctionWithMultipleArgumentNames(t *testing.T) {
+	src := `package foo
+	func Main() int {
+		return add(1, 2)
+	}
+	func add(a, b int) int {
+		return a + b
+	}`
+	eval(t, src, big.NewInt(3))
+}