FIX - Crashlytics issue #114. Prep for app store