fix the orphan and CS