Quick fix for teardown