Fixing orphan cp problem