Fix for thread on destroy