addresses @andyjohnson's suggestion in #326