(v1.0.1) Fixed CP detection bug