fixed serialization problem;