code review for #156