Welcome to your death. Fixes #96 and #99.