Fix for issue #18 - allow destroy in callback