code review following #185