Fix for destory bug