Address feedback from 7bf1ec38 (#102)