Should fix a bug where CP attribute was missing