Shelve specificity. Fixes #189