TDQ-9453: fix the problems reported by zhaoyue in the comments