addresses @andyjohnson's suggestion in #326

addresses @andyjohnson's suggestion in #326

I'll do a separate PR to address my concerns in the same issue.