Add fix for fish shell