Fix confirm issue