Tweak the haddock ordering