fix issue from the code review