fix from cp