[#30642] Fix improvement