Fix for haddock bug