Fix to prevent already present optional properties from being overwritten