Fixed: memory issue and crash on launch
Fixed: Memory issue and crash on launch