Fix conflict when modifying object after adding datastream