code review related to #405