fix bug at code review