Cleaner compatibility. Fixes #92.