diff --git a/share/functions/cd.fish b/share/functions/cd.fish
index ac5e3840a..a08f9e991 100644
--- a/share/functions/cd.fish
+++ b/share/functions/cd.fish
@@ -11,7 +11,7 @@ function cd -d (N_ "Change directory")
 	end
 
 	# Avoid set completions
-	set previous (command pwd)
+	set previous $PWD
 
 	if test $argv[1] = - ^/dev/null
 		if test $__fish_cd_direction = next ^/dev/null
@@ -24,7 +24,7 @@ function cd -d (N_ "Change directory")
 				
 	builtin cd $argv[1]
 
-	if test $status = 0 -a (command pwd) != $previous
+	if test $status = 0 -a $PWD != $previous
 		set -g dirprev $dirprev $previous
 		set -e dirnext
 		set -g __fish_cd_direction prev
diff --git a/share/functions/pwd.fish b/share/functions/pwd.fish
index 33c7577d1..65e8ee7b0 100644
--- a/share/functions/pwd.fish
+++ b/share/functions/pwd.fish
@@ -3,5 +3,5 @@
 #
 
 function pwd -d (N_ "Print working directory")
-	command pwd | sed -e 's|/private||' -e "s|^$HOME|~|"
+	echo $PWD | sed -e 's|/private||' -e "s|^$HOME|~|"
 end