Fix case where value would be overriden by an old one