Fixing issue with fish nightly.