Updating with a code review comment from EduardoMRB