Fix App crashing on app start