Code review's fix