code review for #438