Should maybe be added to zsh completion too?