Avoid Haddock bug #1821