fix bug code

duongdt requested to merge fixbug into 17.0

fix bug code

Merge request reports