Fix early return, misnamed cbs