Fix for haddock