fixing the catalog handoff bugs