fixed #3435. Finish the catalog and chapter 9