diff --git a/modules/osx/functions/pfd b/modules/osx/functions/pfd
index 3e038a68..a4d4b686 100644
--- a/modules/osx/functions/pfd
+++ b/modules/osx/functions/pfd
@@ -7,7 +7,6 @@
 
 osascript 2>/dev/null <<EOF
   tell application "Finder"
-    return POSIX path of (target of window 1 as alias)
+    return POSIX path of (target of first window as text)
   end tell
 EOF
-
diff --git a/modules/osx/functions/pfs b/modules/osx/functions/pfs
index 450310da..54b89106 100644
--- a/modules/osx/functions/pfs
+++ b/modules/osx/functions/pfs
@@ -5,14 +5,11 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-osascript 2>/dev/null <<EOF
-  set output to ""
+osascript 2>&1 <<EOF
   tell application "Finder" to set the_selection to selection
-  set item_count to count the_selection
-  repeat with item_index from 1 to count the_selection
-    if item_index is less than item_count then set the_delimiter to "\n"
-    if item_index is item_count then set the_delimiter to ""
-    set output to output & ((item item_index of the_selection as alias)'s POSIX path) & the_delimiter
-  end repeat
+  if the_selection is not {}
+    repeat with an_item in the_selection
+      log POSIX path of (an_item as text)
+    end repeat
+  end if
 EOF
-