Fixed code review issue