Changed deserialization behavior to be less strict