Fixed CBS null problem