more code review fix