Hopeful fix for https://github.com/fish-shell/fish-shell/issues/594