Fix hanging destroy() command