Fix destroy path

Fixes #25

There is no spec yet since I'm not certain if this is the preferred way to fix this. Will gladly provide a spec if it's approved.

Would appreciate a timely handling to get my local patches out.