code review line 796