Fix Haddock