Workaround fish-shell/fish-shell#597. Closes #20.