fish.coffee logic changed