fix for Parcelable