Bug when pressing edit on CPC fixed