FIX Possible fix for teardown issue.