Code review fix