Keep haddock happy