fixed android serialization bugs