[#58728258] add some changes from the comments