[fix] Apply #4574 fix manually