Fixed issue found in code review