084792b829657cdf516799e43f89c0b8c22f4ab8

 1diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
 2index d101cfcae6a435ac0d78398f23cb1aac809a0efc..a2faa9ee4b847c7c5f390a27043e466b2aa5b862 100644
 3--- a/plugins/dirhistory/dirhistory.plugin.zsh
 4+++ b/plugins/dirhistory/dirhistory.plugin.zsh
 5@@ -49,7 +49,9 @@ function push_future() {
 6 }
 7 
 8 # Called by zsh when directory changes
 9-function chpwd() {
10+typeset -ga chpwd_functions
11+chpwd_functions+='chpwd_dirhistory'
12+function chpwd_dirhistory() {
13   push_past $PWD
14   # If DIRHISTORY_CD is not set...
15   if [[ -z "${DIRHISTORY_CD+x}" ]]; then
16diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
17index 75041f08ef63874a9ecba86180ea912bb9d43e2c..708ae4f747a7c8b20ffb8eda2118eaf782d81b3c 100644
18--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
19+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
20@@ -8,7 +8,9 @@ mkdir -p $ZSH_CACHE_DIR
21 cache_file="$ZSH_CACHE_DIR/last-working-dir"
22 
23 # Updates the last directory once directory is changed.
24-function chpwd() {
25+typeset -ga chpwd_functions
26+chpwd_functions+='chpwd_last_working_dir'
27+function chpwd_last_working_dir() {
28   # Use >| in case noclobber is set to avoid "file exists" error
29 	pwd >| "$cache_file"
30 }