Possible fix for random BadParcelableException