Add back the sel==0 case