code review for #404