Update due to upstream PR review