Fixed deserialize issue