FIx: object not unserializable feature