[Issue #17] Change meh handling to be a bit less draconian