diff --git a/bin/tools/foamConfigurePaths b/bin/tools/foamConfigurePaths
index 6890d35ed0d48220537f68515a5706d4d23dcfe1..2d5a4cf6e7fa53fcaa5c8f8b721607ce67ef8a3d 100755
--- a/bin/tools/foamConfigurePaths
+++ b/bin/tools/foamConfigurePaths
@@ -123,7 +123,7 @@ _matches()
     local result
     for regexp
     do
-        result=$(echo "$input" | sed -n -e "/^$regexp"'$/p')
+        result=$(echo "$input" | sed -ne "/^$regexp"'$/p')
         test -n "$result" && return 0  # successful match
     done
     return 1
@@ -243,7 +243,7 @@ removeBashMagic()
 # ----
 # set projectName="$WM_PROJECT"
 # set projectDir=`lsof +p $$ |& \
-#     sed -n -e 's@^[^/]*@@; s@\(/'"$projectName"'[^/]*\)/etc/cshrc[^/]*@\1@p'`
+#     sed -ne 'something /etc/cshrc something'`
 # ----
 removeCshMagic()
 {
@@ -586,8 +586,8 @@ do
         _matches "$optionValue" "$expected" || \
             die "'$1' has bad value: '$optionValue'"
 
-        replace    etc/config.sh/paraview   ParaView_VERSION "$optionValue"
-        replaceCsh etc/config.csh/paraview  ParaView_VERSION "$optionValue"
+        replace etc/config.sh/paraview   ParaView_VERSION "$optionValue"
+        replace etc/config.csh/paraview  ParaView_VERSION "$optionValue"
         adjusted=true
         shift
         ;;
diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index e8acdadc637a4914355c0e85e7b777c648f8d1c5..a0fb0c6351e686e8e0ac038cc7dafed035947570 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -77,15 +77,14 @@ endif
 while ( $#argv > 0 )
     switch ($argv[1])
     case ParaView*=*:
-        # name=value  -> setenv name value
-        eval "setenv $argv[1]:s/=/ /"
+        # name=value  -> set name=value
+        eval "set $argv[1]"
         breaksw
     endsw
     shift
 end
 
-if (! $?ParaView_VERSION ) set ParaView_VERSION=''
-
+if ($?ParaView_VERSION) then
 switch ("$ParaView_VERSION")
 case "":
     # empty - do nothing
@@ -209,8 +208,8 @@ default:
         setenv ParaView_DIR   # Defined but empty (used by foamPV alias)
     endif
     breaksw
-
 endsw
+endif
 
 unset cleaned archDir
 unset cmake cmake_version