[#2289] More improvements