zsh compat

Change-Id: I11621ad997c8936dc8f5cefb2d9b11f500127e46