Fixed bug in parcelable implementation