Fixed: memory issue and crash on launch