fixed bug
(cherry-picked from 1d22fcf)
fixed bug
Merge branch 'FixWrongMerge'