fixed issue with json serialization