Fixes #75
Don't assume regex matches