Close #34

We might have missed an instance or two, not sure...