Fixes:
- App crash on application startup