Killing me softly. Fixes #169.