apply code review #17