Haddock fix