Fixed hang on cleanup