Death fix (closes #14)