code review for #405