Risch, fixes #505
Coburn, fixes #429