Vmeyet/fix teardown multiple call at the end

merge me