Fixes #113 (naughty PreDestroy)