Patch comments on CITI and UBSS's comments