Change made after PR review