fix for hang on startup