Fixes #6635,BZ1114046 - Fixing undefined method cp_id error