Fix for zsh issue

@graemechristie  @davidfowl 
Merging the changes from kvm repo to home repo so that the fix is in the kvm installed by homebrew