FIX - Crashlytics issue #74