address comments from PR
Jeromy authored
f45d575a