Nuke the cat!

Fixes #536