bugfix for cp2