don't feel good about this, but closes GH-101