Try to fix doc handling again.