Do not serialize already serialized values

Related to #477 , however will not fix existing data, yet