Resolve crashlytics issue #58