Bugfix on destroy
0.3.2