Replace rare cases with some cases

Fixes #130