Manually resolve @jennahines PR #14