Fixed issue with parcelable