More Progress in Fixing BibPlan