Created by: harrisonliu5
What type of PR is this? /kind bug
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #2367
/assign @leoendless