In the name of tragedy. Fixes #232. Fixes #217.