Fixed by the code review results