Fix for CPT delete issue