diff --git a/ChangeLog b/ChangeLog
index fb4a5a3a7..367d90c23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-11  dana  <dana@dana.is>
+
+	* 42984: dana: Completion/Unix/Type/_files,
+	Completion/Unix/Type/_object_files: fix argument pass-through to compadd
+
 2018-06-10  Oliver Kiddle  <okiddle@yahoo.co.uk>
 
 	* 42978: dana: Completion/Darwin/Command/_pbcopy: fix small bug
diff --git a/Completion/Unix/Type/_files b/Completion/Unix/Type/_files
index 2b0c5580a..5df22ea46 100644
--- a/Completion/Unix/Type/_files
+++ b/Completion/Unix/Type/_files
@@ -121,7 +121,7 @@ for def in "$pats[@]"; do
 	    done
 	  fi
         else
-          _path_files "$expl[@]" -g "$pat" "$opts[@]" && ret=0
+          _path_files -g "$pat" "$opts[@]" "$expl[@]" && ret=0
         fi
       done
       (( ret )) || break
diff --git a/Completion/Unix/Type/_object_files b/Completion/Unix/Type/_object_files
index 595265116..6b931372f 100644
--- a/Completion/Unix/Type/_object_files
+++ b/Completion/Unix/Type/_object_files
@@ -9,4 +9,4 @@ __object_file() {
 	$REPLY = (core*|*.core) ]]
 }
 
-_files -g '*(-.e,__object_file,)'
+_files -g '*(-.e,__object_file,)' "$@" "${(@)expl}"