Bugfixing hang on launch