[#909] More changes