Add compatibility with zshell
Add compatibility with zshell