Fix issue with !2060

/cc @tnanut

Merge request reports

Loading