Fixing for code review