Fixing crash on launch bug