fix merge conflicts w/ PR 104

See #104