Fixing the issues related to CP Based View Tree