can't reproduce dying

I am only able to reproduce the bug sporadically, so it would be great if someone who could do it consistently tested this.

Fixes #633 ?