First App Launch fix