CBF_Scan v1.0 Fix