Fix Json deserialization