[#858] update to comments